home *** CD-ROM | disk | FTP | other *** search
/ Sprite 1984 - 1993 / Sprite 1984 - 1993.iso / src / X11R4 / cmds / X / ddx / Xsun / patches / sunInit.c.patch < prev    next >
Encoding:
Text File  |  1991-11-05  |  4.7 KB  |  182 lines
  1. *** /tmp/,RCSt1659767    Mon Nov  4 17:41:20 1991
  2. --- sunInit.c    Tue Jan  8 23:00:54 1991
  3. ***************
  4. *** 48,53 ****
  5. --- 48,54 ----
  6.   #endif
  7.   
  8.   #include    "sun.h"
  9. + #include    <signal.h>
  10.   #include    <servermd.h>
  11.   #include    "dixstruct.h"
  12.   #include    "dix.h"
  13. ***************
  14. *** 54,68 ****
  15.   #include    "opaque.h"
  16.   #include    "mipointer.h"
  17.   
  18.   extern int sunMouseProc();
  19.   extern int sunKbdProc();
  20.   extern Bool sunBW2Probe(), sunBW2Create();
  21.   extern Bool sunCG2CProbe(), sunCG2CCreate();
  22.   extern Bool sunCG3CProbe(), sunCG3CCreate();
  23.   extern Bool sunCG4CProbe(), sunCG4CCreate();
  24. - #ifdef FBTYPE_SUNFAST_COLOR /* doesn't exist in sunos3.x */
  25.   extern Bool sunCG6CProbe(), sunCG6CCreate();
  26. - #endif
  27.   extern void ProcessInputEvents();
  28.   
  29.   extern void SetInputCheck();
  30. --- 55,77 ----
  31.   #include    "opaque.h"
  32.   #include    "mipointer.h"
  33.   
  34. + #define    R_OK    4
  35. + #define    W_OK    2
  36. + #define    X_OK    1
  37. + #define    F_OK    0
  38. + 
  39. + #include "sys/ioctl.h"
  40. + #include "fcntl.h"
  41. + 
  42.   extern int sunMouseProc();
  43.   extern int sunKbdProc();
  44.   extern Bool sunBW2Probe(), sunBW2Create();
  45. + #ifndef    sprite
  46.   extern Bool sunCG2CProbe(), sunCG2CCreate();
  47. + #endif    sprite
  48.   extern Bool sunCG3CProbe(), sunCG3CCreate();
  49.   extern Bool sunCG4CProbe(), sunCG4CCreate();
  50.   extern Bool sunCG6CProbe(), sunCG6CCreate();
  51.   extern void ProcessInputEvents();
  52.   
  53.   extern void SetInputCheck();
  54. ***************
  55. *** 72,78 ****
  56.   #define    XDEVICE    "XDEVICE"
  57.   #define    PARENT    "WINDOW_GFX"
  58.   
  59. ! int sunSigIO = 0;     /* For use with SetInputCheck */
  60.   static int autoRepeatHandlersInstalled;    /* FALSE each time InitOutput called */
  61.   
  62.   static Bool sunDevsProbed = FALSE;
  63. --- 81,87 ----
  64.   #define    XDEVICE    "XDEVICE"
  65.   #define    PARENT    "WINDOW_GFX"
  66.   
  67. ! int spriteCheckInput = 0;     /* For use with SetInputCheck */
  68.   static int autoRepeatHandlersInstalled;    /* FALSE each time InitOutput called */
  69.   
  70.   static Bool sunDevsProbed = FALSE;
  71. ***************
  72. *** 79,115 ****
  73.   Bool sunSupportsDepth8 = FALSE;
  74.   unsigned long sunGeneration = 0;
  75.   
  76. - 
  77. - /*-
  78. -  *-----------------------------------------------------------------------
  79. -  * SigIOHandler --
  80. -  *    Signal handler for SIGIO - input is available.
  81. -  *
  82. -  * Results:
  83. -  *    sunSigIO is set - ProcessInputEvents() will be called soon.
  84. -  *
  85. -  * Side Effects:
  86. -  *    None
  87. -  *
  88. -  *-----------------------------------------------------------------------
  89. -  */
  90. - /*ARGSUSED*/
  91. - static void
  92. - SigIOHandler(sig, code, scp)
  93. -     int        code;
  94. -     int        sig;
  95. -     struct sigcontext *scp;
  96. - {
  97. -     sunSigIO = 1;
  98. - }
  99. - 
  100.   sunFbDataRec sunFbData[] = {
  101.       sunBW2Probe,      "/dev/bwtwo0",        sunBW2Create,
  102.       sunCG2CProbe,      "/dev/cgtwo0",        sunCG2CCreate,
  103.       sunCG3CProbe,      "/dev/cgthree0",    sunCG3CCreate,
  104. - #ifdef FBTYPE_SUNFAST_COLOR
  105.       sunCG6CProbe,    "/dev/cgsix0",        sunCG6CCreate,
  106. - #endif
  107.       sunCG4CProbe,      "/dev/cgfour0",        sunCG4CCreate,
  108.       sunBW2Probe,      "/dev/bwtwo0",        sunBW2Create,
  109.   };
  110. --- 88,100 ----
  111.   Bool sunSupportsDepth8 = FALSE;
  112.   unsigned long sunGeneration = 0;
  113.   
  114.   sunFbDataRec sunFbData[] = {
  115.       sunBW2Probe,      "/dev/bwtwo0",        sunBW2Create,
  116. + #ifndef    sprite
  117.       sunCG2CProbe,      "/dev/cgtwo0",        sunCG2CCreate,
  118. + #endif    sprite
  119.       sunCG3CProbe,      "/dev/cgthree0",    sunCG3CCreate,
  120.       sunCG6CProbe,    "/dev/cgsix0",        sunCG6CCreate,
  121.       sunCG4CProbe,      "/dev/cgfour0",        sunCG4CCreate,
  122.       sunBW2Probe,      "/dev/bwtwo0",        sunBW2Create,
  123.   };
  124. ***************
  125. *** 149,157 ****
  126. --- 134,144 ----
  127.   {
  128.       register int i;
  129.   
  130. + #ifndef    sprite
  131.       i = fcntl(2, F_GETFL, 0);
  132.       if (i >= 0)
  133.       (void) fcntl(2, F_SETFL, i & ~FNDELAY);
  134. + #endif    sprite
  135.   }
  136.   
  137.   /*-
  138. ***************
  139. *** 187,192 ****
  140. --- 174,180 ----
  141.       else if (!strcmp(argv[i],"-mono"))
  142.           devStart = 0;
  143.       }
  144. + #ifndef    sprite
  145.       /*
  146.        *    Writes to /dev/console can block - causing an
  147.        *    excess of error messages to hang the server in
  148. ***************
  149. *** 206,211 ****
  150. --- 194,200 ----
  151.           ErrorF("InitOutput: can't put stderr in non-block mode\n");
  152.       }
  153.       }
  154. + #endif    sprite
  155.       pScreenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
  156.       pScreenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
  157.       pScreenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
  158. ***************
  159. *** 272,280 ****
  160.       RegisterPointerDevice(p);
  161.       RegisterKeyboardDevice(k);
  162.       miRegisterPointerDevice(screenInfo.screens[0], p);
  163. !     signal(SIGIO, SigIOHandler);
  164.   
  165. !     SetInputCheck (&zero, &sunSigIO);
  166.   }
  167.   
  168.   /*-
  169. --- 261,272 ----
  170.       RegisterPointerDevice(p);
  171.       RegisterKeyboardDevice(k);
  172.       miRegisterPointerDevice(screenInfo.screens[0], p);
  173. ! 
  174. !     spriteCheckInput = 0;
  175. !     SetInputCheck (&zero, &spriteCheckInput);
  176.   
  177. !     screenInfo.screens[0]->blockData =
  178. !     screenInfo.screens[0]->wakeupData = (pointer)k;
  179.   }
  180.   
  181.   /*-
  182.